# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.930.54.1 -> 1.930.54.2 # drivers/char/agp/agpgart_be.c 1.41.1.10 -> 1.41.1.11 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/02/27 bjorn_helgaas@hp.com 1.930.52.6 # Merge hp.com:/home/helgaas/bk/ia64-extras # into hp.com:/home/helgaas/bk/linux-ia64-2.4 # -------------------------------------------- # 03/02/28 agrover@groveronline.com 1.960 # ACPI: update to 20030228 # -------------------------------------------- # 03/02/28 agrover@groveronline.com 1.961 # Merge groveronline.com:/root/bk/linux-2.4 # into groveronline.com:/root/bk/linux-2.4-acpi # -------------------------------------------- # 03/03/03 paulus@samba.org 1.930.1.78 # Merge samba.org:/home/paulus/kernel/linux-2.4 # into samba.org:/home/paulus/kernel/for-marcelo-ppc # -------------------------------------------- # 03/03/03 davem@nuts.ninka.net 1.930.55.1 # Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.4 # into nuts.ninka.net:/home/davem/src/BK/sparc-2.4 # -------------------------------------------- # 03/03/03 rob@osinvestor.com 1.930.55.2 # [SPARC]: kmap_nonblock changes. # -------------------------------------------- # 03/03/03 zaitcev@redhat.com 1.930.55.3 # [SPARC32/64]: Expand ioctl size field in backwards-compatible way. # -------------------------------------------- # 03/03/03 chas@locutus.cmf.nrl.navy.mil 1.930.39.16 # [ATM]: Use skb_pull instead of direct skb mangling. # -------------------------------------------- # 03/03/03 chas@locutus.cmf.nrl.navy.mil 1.930.39.17 # [ATM]: Get minimum frame size right in lec.c # -------------------------------------------- # 03/03/03 chas@locutus.cmf.nrl.navy.mil 1.930.39.18 # [ATM]: Let upper layer k now lec supports multicast. # -------------------------------------------- # 03/03/03 harald@gnumonks.org 1.930.39.19 # [NETFILTER]: Fix icmp-type all problem in iptables. # -------------------------------------------- # 03/03/03 laforge@netfilter.org 1.930.39.20 # [NETFILTER]: fix NAT ICMP reply translation of inner packet. # -------------------------------------------- # 03/03/03 laforge@netfilter.org 1.930.39.21 # [NETFILTER]: Fix conntrack bug introduced by list_del change. # -------------------------------------------- # 03/03/03 laforge@netfilter.org 1.930.39.22 # [NETFILTER]: Fix typo in ftp conntrack helper. # -------------------------------------------- # 03/03/03 laforge@netfilter.org 1.930.39.23 # [NETFILTER]: Add new ip6tables matches. # -------------------------------------------- # 03/03/03 davem@nuts.ninka.net 1.930.39.24 # [NETFILTER]: Fix typo in ipv6 makefile changes. # -------------------------------------------- # 03/03/03 chas@locutus.cmf.nrl.navy.mil 1.930.39.25 # [ATM SUNI]: suni_init should not be __init and remove mod inc/dec. # -------------------------------------------- # 03/03/03 paulus@samba.org 1.930.1.79 # PPC32: Implement kmap_nonblock, add extra argument to kmap_high call. # -------------------------------------------- # 03/03/03 zaitcev@redhat.com 1.930.55.4 # [SPARC]: RTC driver needs to include linux/pci.h # -------------------------------------------- # 03/03/03 davem@nuts.ninka.net 1.930.56.1 # Merge nuts.ninka.net:/home/davem/src/BK/network-2.4 # into nuts.ninka.net:/home/davem/src/BK/net-2.4 # -------------------------------------------- # 03/03/03 davem@nuts.ninka.net 1.930.56.2 # [NET]: Fix mismerge, no need to export skb_pad twice. # -------------------------------------------- # 03/03/03 bcrl@redhat.com 1.930.56.3 # [NET]: Make sure nr_frags is accurate on paged SKB allocation failure. # -------------------------------------------- # 03/03/03 paulus@samba.org 1.930.1.80 # PPC32: Add missing break, without which get_user on 8-byte quantities would fail. # -------------------------------------------- # 03/03/03 chas@locutus.cmf.nrl.navy.mil 1.930.56.4 # [ATM FORE200E]: Fix build. # -------------------------------------------- # 03/03/03 jmorris@intercode.com.au 1.930.56.5 # [NET]: dst_clone --> dst_hold where appropriate. # -------------------------------------------- # 03/03/03 trini@kernel.crashing.org 1.930.57.1 # PPC32: Export m8xx_cpm_hostalloc on CONFIG_8xx. # Pointed out by Jean-Denis Boyer . # -------------------------------------------- # 03/03/04 bjorn_helgaas@hp.com 1.930.54.2 # AGPGART: Workaround for gcc-3.2.2 defect on ia64. # -------------------------------------------- # diff -Nru a/drivers/char/agp/agpgart_be.c b/drivers/char/agp/agpgart_be.c --- a/drivers/char/agp/agpgart_be.c Wed Oct 8 09:06:55 2003 +++ b/drivers/char/agp/agpgart_be.c Wed Oct 8 09:06:55 2003 @@ -341,26 +341,18 @@ temp = agp_bridge.current_size; - switch (agp_bridge.size_type) { - case U8_APER_SIZE: + if (agp_bridge.size_type == U8_APER_SIZE) current_size = A_SIZE_8(temp)->size; - break; - case U16_APER_SIZE: + else if (agp_bridge.size_type == U16_APER_SIZE) current_size = A_SIZE_16(temp)->size; - break; - case U32_APER_SIZE: + else if (agp_bridge.size_type == U32_APER_SIZE) current_size = A_SIZE_32(temp)->size; - break; - case LVL2_APER_SIZE: + else if (agp_bridge.size_type == LVL2_APER_SIZE) current_size = A_SIZE_LVL2(temp)->size; - break; - case FIXED_APER_SIZE: + else if (agp_bridge.size_type == FIXED_APER_SIZE) current_size = A_SIZE_FIX(temp)->size; - break; - default: + else current_size = 0; - break; - } current_size -= (agp_memory_reserved / (1024*1024));